Cleaned up CoreAdmin layout