Refactored classes and menus to improve usability