layout and js changes