more UI/JS fixes