Refactored Admin page code -- Ravi/Vikhyath