layout-improvements + code cleanups