Cleanup before merge
Use clever grid push/pull for better brandbar layout
Update layout and remove dublicate navbar