bug fixed
fix some layout bugs