Updates to refactored code using includes, admin page added