re-organized templates
started on dashboard