Minor Refactors, attempt to correct menu filenames