Refactoring & set layout for admin