Updates to layout, better separation of concerns.