cleanups of layout