Fixes to JS and some style changes