Added workstation time + misc templates/view changes