more layout and js updates