fix few layout bugs