Some cleanup, added jquery ui and removed datepicker
Reworked the calendar for magic