Refactor for manager pages