UI changes

as recommended by Subhashis - thanks