fix for header bar
Merge branch 'Saumya'