KNL-268 Refactor Admin Panel