Imporoved layout a bit