Cleanup and consolidation of admin page layout templates