Fixes in layout + fixed sorting of filtered results
Merge branch 'develop' into forge-3122

Conflicts:
	views/css/tao-main-style.css
	views/css/tao-main-style.css.map
Merge branch 'forge-3122' into develop