updated layout and js