Some tweaks in UI