fix bug that was double including jquery, clean up some old classes and ids