Included a little bit of JS and design updates