Styling fixes
Split out JS