Updated layout and js methods