Layout and JS changes. Still a work in progress