small adjustments to layout after feedback from matt
merge