UI improvements fluid-layout