Some more work on mainmenu theme