Bug fixes for rotating and then coming back to the main menu screen