Main menu bugfixes & added icons