Minor UI Fix
Merge branch 'initial_screen'