Feature/admin page cleanup