Minor tweaks on look and feel