Fix Bug 943835, implement new layout tweaks

@erikrose r? Note this does not include the new tree selector yet, that will come in a follow on PR