Neatify files, proper menus (sort of), and other changes