Made changes to JS and CSS, fixed bug