Code cleanup and CanvasMainMenu implemented