Imroved layout