Update to JS (simplified) and update to overal style