Added Menus and Cleaned up Little Bit