Fixed jQuery and re-did formatting