Major Layout changes (fluid containers) and UI updates to header mapping section