Ongoing layout changes

Issue #96