Fixes for new JS and CSS layout