Revisions to layout, cleaning it up