fix for header bar
Merge branch 'Saumya'
uncomment img optimzation
remove image optimization code
Merge remote-tracking branch 'origin/master' into Kevin