clean up of layout