Layout update
Refactoring flex-sections
flex-box changes
more layout changes