Edited menus and added javadoc