Fix layout bugs@
Fix layout bugs@4