improvements on layout

I did some fixes on layout.