modified UI
deleted old style templates
added new style templates
renamed html files
Merge branch 'ui_ux'
removed old style templates