reorder sections and pages, fix login_required