Increased menu functionality; abstracted code; added manifest