New changes to layout and JS