changes to layout and js