layout and header updates to t1-t3, fixed search form on t1 and t3
Merge branch 'master' into data-json

Conflicts:
	src/main/resources/files/t2.html