Main menu fixes / improvements