Layout update, based on Poole + Hyde by @mdo