Minor additions to layout