Remove unnecessary global helpers, fix admin page