Correcting indentation on imported source files.
Extracted menu code to separate source files.