Fixes

Remove Jquery-ui / Fix errors on calendar generate