UI Improvements, stylistic changes to JS code