Multiple layout changes in header

Scrollbar issue (map 100% height) still needs to be fixed