fix some layout and js