More progress on main menu