Style modifications for dashboard

Style modifications for dashboard
Merge remote-tracking branch 'origin/phase1' into phase1

Conflicts:
	src/main/webapp/WEB-INF/header.jsp
Conflicted file after merge
Conflict resolved