Fixed layouts. Should address Issue #113.