layout clean ups