Made the classes less redundant and hooked up the javascript files correctly