Layout improvement