refactor headers & fix /admin