Cleanup JS and restyle some CSS