Tweaked some elements to enhance UX

Tweaked some elements to enhance user experience.