Add option to edit, fix subpage problem with menu