Fix styles merge issue

This reverts styles and js to what they were before a merge that mucked things up.