Template new in nocms-admin style
Merge branch 'features/nocms-admin'