Made debugging easier and added sub menus