Tweaks to layout, inc. removing code.