More cleanup, added better chart plugin and datepicker