UI Improvements to all screens