proposals refactoring, catalog admin layout