header change
Fixed scss file
Merged from live