added layouts and js