Hide layout, a little cleanup