Fixes to main screen + Menu