Added helper + minor UI changes