Added menu files, cleaned up labels