Minor changes on classes and enhancements on menus