Merged files and fixed most of the JQUERY