More layout changes
merge conflicts resolved
Updates to layout