new layout and js goodness