removed some jquery and changed the names of selectors to more logical ones