Major changes to page structure on admin side