Updated main js and UI