further fix  to layout