Adding other sections with new layout, fixing up layout a bit more