Layout cleanup -- WIP, don't merge