Adjusted classes and main menu to cleaner code, organized code