Merge "New css to fix logo/header issue" into staging