Impress layout

Unfortunate messy PR with some other changes.