JS and styling fixes