Updated Menu System

- Includes goto statements
- Some formatting changes in the outoput