Simplified JQuery function calls, actually removed inline js -_-