lot of improvements of layout