Started work on new template with ui-route

@tlvince, kindly review updates and merge