add menu files and clean up some other things