Cleaned up
Cleaned up the flow of the menu system
Added new file for LCD version, will eventually become main