Minor Fixes in UI layout and design