Layout improved