More cleanup for layout