Menu updates, code cleaning and a new level base