Code Clean-up #2

* Moved menu fxns out of main program
- Doing so has created a crash loop.
- Need to fix