Updates to CSS and JS logic