Small UI changes wrt usability