Admin view improvements. Template reorganization.
Reorganizing templates