paginate and restructure

7 files changed, 321 insertions, 210 deletions

diff --git a/application.rb b/application.rb
index af78b05..75664de 100644
--- a/application.rb
+++ b/application.rb
@@ -15,14 +15,16 @@ use Rack::Auth::Basic, "Please enter your login credentials." do |username, pass
   [username, password] == [$user, $pass]
 end
 
-configure :production do
-  $logger = Logger.new(STDOUT)
-  enable :reloader
-end
-
-configure :development do
+configure :development, :production do
   $logger = Logger.new(STDOUT)
   enable :reloader
+  [
+    'batch.rb',
+    'helper.rb',
+    'prediction.rb'
+  ].each do |lib|
+    also_reload lib
+  end
 end
 
 before do
@@ -43,36 +45,90 @@ get '/?' do
 end
 
 get '/predict/?' do
-  @models = OpenTox::Model::Validation.all
+  begin
+    Process.kill(9,params[:tpid].to_i) if !params[:tpid].blank? #if (Process.getpgid(pid) rescue nil).present?
+  rescue
+    nil
+  end
+  @models = Model::Validation.all
   @models = @models.delete_if{|m| m.model.name =~ /\b(Net cell association)\b/}
   @endpoints = @models.collect{|m| m.endpoint}.sort.uniq
-  if @models.count > 0
-    rodent_index = 0
-    @models.each_with_index{|model,idx| rodent_index = idx if model.species =~ /Rodent/}
-    @models.insert(rodent_index-1,@models.delete_at(rodent_index))
-  end
-  @models.count > 0 ? (haml :predict) : (haml :info)
+  @models.count <= 0 ? (haml :info) : (haml :predict)
 end
 
-get '/predict/modeldetails/:model' do
-  model = OpenTox::Model::Validation.find params[:model]
-  crossvalidations = OpenTox::Validation::RepeatedCrossValidation.find(model.repeated_crossvalidation_id).crossvalidations
+get '/task/?' do
+  if params[:turi]
+    task = Task.find(params[:turi].to_s)
+    return JSON.pretty_generate(:percent => task.percent)
+  elsif params[:predictions]
+    task = Task.find(params[:predictions])
+    pageSize = params[:pageSize].to_i - 1
+    pageNumber= params[:pageNumber].to_i - 1
+    predictions = task.predictions[params[:model]].collect{|hash| hash.values[0]}
+    prediction_object = Prediction.find predictions[pageNumber]
+    prediction = prediction_object.prediction
+    compound = Compound.find prediction_object.compound
+    model = Model::Validation.find prediction_object.model
+    image = compound.svg
+    smiles = compound.smiles
+    type = (model.regression? ? "Regression" : "Classification")
+    html = "<table class=\"table table-bordered single-batch\"><tr>"
+    html += "<td>#{image}</br>#{smiles}</br></td>"
+    string = "<td><table class=\"table\">"
+    sorter = []
+    if prediction[:info]
+      prediction[:info] = "This compound was part of the training dataset. All information from this compound was "\
+                          "removed from the training data before the prediction to obtain unbiased results."
+      sorter << {"Info" => prediction[:info]}
+      if prediction["measurements_string"].kind_of?(Array)
+        sorter << {"Measured activity" => "#{prediction["measurements_string"].join(";")}</br>#{prediction["converted_measurements"].join(";")}"}
+      else
+        sorter << {"Measured activity" => "#{prediction["measurements_string"]}</br>#{prediction["converted_measurements"]}"}
+      end
+    end
 
-  return haml :model_details, :layout=> false, :locals => {:model => model, :crossvalidations => crossvalidations}
+    # regression
+    if prediction[:value] && type == "Regression"
+      sorter << {"Prediction" => "#{prediction["prediction_value"]}</br>#{prediction["converted_prediction_value"]}"}
+      sorter << {"95% Prediction interval" => "#{prediction[:interval]}</br>#{prediction["converted_interval"]}"}
+      sorter << {"Warnings" => prediction[:warnings].join("</br>")}
+    elsif !prediction[:value] && type == "Regression"
+      sorter << {"Prediction" => ""}
+      sorter << {"95% Prediction interval" => ""}
+      sorter << {"Warnings" => prediction[:warnings].join("</br>")}
+    # classification
+    elsif prediction[:value] && type == "Classification"
+      sorter << {"Lazar mutagenicity (Salmonella typhimurium)" => ""}
+      sorter << {"Prediction" => prediction[:value]}
+      sorter << {"Probability" => prediction[:probabilities].collect{|k,v| "#{k}: #{v.signif(3)}"}.join("</br>")}
+    elsif !prediction[:value] && type == "Classification"
+      sorter << {"Lazar mutagenicity (Salmonella typhimurium)" => ""}
+      sorter << {"Prediction" => ""}
+      sorter << {"Probability" => ""}
+      sorter << {"Warnings" => prediction[:warnings].join("</br>")}
+    end
+    sorter.each_with_index do |hash,idx|
+      k = hash.keys[0]
+      v = hash.values[0]
+      string += (idx == 0 ? "<tr class=\"hide-top\">" : "<tr>")+(k =~ /lazar/i ? "<td colspan=\"2\">" : "<td>")
+      # keyword
+      string += "#{k}:"
+      string += "</td><td>"
+      # values
+      string += "#{v}"
+      string += "</td></tr>"
+    end
+    string += "</table></td>"
+    html += "#{string}</tr></table>"
+    return JSON.pretty_generate(:prediction => [html])
+  end
 end
 
-# get individual compound details
-get '/prediction/:neighbor/details/?' do
-  @compound = OpenTox::Compound.find params[:neighbor]
-  @smiles = @compound.smiles
-  begin
-    @names = @compound.names.nil? ? "No names for this compound available." : @compound.names
-  rescue
-    @names = "No names for this compound available."
-  end
-  @inchi = @compound.inchi.gsub("InChI=", "")
+get '/predict/modeldetails/:model' do
+  model = Model::Validation.find params[:model]
+  crossvalidations = Validation::RepeatedCrossValidation.find(model.repeated_crossvalidation_id).crossvalidations
 
-  haml :details, :layout => false
+  return haml :model_details, :layout=> false, :locals => {:model => model, :crossvalidations => crossvalidations}
 end
 
 get '/jme_help/?' do
@@ -86,210 +142,238 @@ get '/predict/dataset/:name' do
   csv
 end
 
-get '/predict/:tmppath/:filename/?' do
+get '/predict/csv/:task/:model/:filename/?' do
   response['Content-Type'] = "text/csv"
-  path = "/tmp/#{params[:tmppath]}"
-  send_file path, :filename => "lazar_batch_prediction_#{params[:filename]}", :type => "text/csv", :disposition => "attachment"
-end
-
-post '/predict/?' do
-
-  # process batch prediction
-  if !params[:fileselect].blank?
-    if params[:fileselect][:filename] !~ /\.csv$/
-      bad_request_error "Please submit a csv file."
+  filename = params[:filename] =~ /\.csv$/ ? params[:filename].gsub(/\.csv$/,"") : params[:filename]
+  task = Task.find params[:task].to_s
+  m = Model::Validation.find params[:model].to_s
+  dataset = Batch.find_by(:name => filename)
+  warnings = dataset.warnings.blank? ? nil : dataset.warnings.join("\n")
+  unless warnings.nil?
+    keys_array = []
+    warnings.split("\n").each do |warning|
+      text = warning.split("ID").first
+      numbers = warning.split("ID").last.split("and")
+      keys_array << numbers.collect{|n| n.strip.to_i}
     end
-    File.open('tmp/' + params[:fileselect][:filename], "w") do |f|
-      f.write(params[:fileselect][:tempfile].read)
+    @dups = {}
+    keys_array.each do |keys|
+      keys.each do |key|
+        @dups[key] = "Duplicate compound at ID #{keys.join(" and ")}\n"
+      end
     end
-    @filename = params[:fileselect][:filename]
-    begin
-      input = OpenTox::Dataset.from_csv_file File.join("tmp", params[:fileselect][:filename]), true
-      if input.class == OpenTox::Dataset
-        dataset = OpenTox::Dataset.find input
+  end
+  endpoint = "#{m.endpoint}_(#{m.species})"
+  tempfile = Tempfile.new
+  header = task.csv
+  lines = []
+  task.predictions[params[:model]].each_with_index do |hash,idx|
+    identifier = hash.keys[0]
+    prediction_id = hash.values[0]
+    # add duplicate warning at the end of a line if ID matches
+    if @dups && @dups[idx+1]
+      if prediction_id.is_a? BSON::ObjectId
+        lines << "#{idx+1},#{identifier},#{Prediction.find(prediction_id).csv.tr("\n","")},#{@dups[idx+1]}"
       else
-        bad_request_error "Could not serialize file '#{@filename}'."
+        lines << "#{idx+1},#{identifier},#{p},#{@dups[idx+1]}"
       end
-    rescue
-      bad_request_error "Could not serialize file '#{@filename}'."
-    end
-    @compounds = dataset.compounds
-    if @compounds.size == 0
-      message = dataset[:warnings]
-      dataset.delete
-      bad_request_error message
-    end
-
-    # for csv export
-    @batch = {}
-    # for haml table
-    @view = {}
-
-    @compounds.each{|c| @view[c] = []}
-    params[:selection].keys.each do |model_id|
-      model = OpenTox::Model::Validation.find model_id
-      @batch[model] = []
-      @compounds.each_with_index do |compound,idx|
-        prediction = model.predict(compound)
-        @batch[model] << [compound, prediction]
-        @view[compound] << [model,prediction]
+    else
+      if prediction_id.is_a? BSON::ObjectId
+        lines << "#{idx+1},#{identifier},#{Prediction.find(prediction_id).csv}"
+      else
+        lines << "#{idx+1},#{identifier},#{p}\n"
       end
     end
+  end
+  csv = header + lines.join("")
+  tempfile.write(csv)
+  tempfile.rewind
+  send_file tempfile, :filename => "#{Time.now.strftime("%Y-%m-%d")}_lazar_batch_prediction_#{endpoint}_#{filename}.csv", :type => "text/csv", :disposition => "attachment"
+end
 
-    @csvhash = {}
-    @warnings = dataset[:warnings]
-    dupEntries = {}
-    delEntries = ""
-    
-    # split duplicates and deleted entries
-    @warnings.each do |w|
-      substring = w.match(/line .* of/)
-      unless substring.nil?
-        delEntries += "\"#{w.sub(/\b(tmp\/)\b/,"")}\"\n"
+post '/predict/?' do
+  # process batch prediction
+  if !params[:fileselect].blank? || !params[:existing].blank?
+    if !params[:existing].blank?
+      @dataset = Batch.find params[:existing].keys[0]
+      @compounds = @dataset.compounds
+      @identifiers = @dataset.identifiers
+      @filename = @dataset.name
+    end
+    if !params[:fileselect].blank?
+      if params[:fileselect][:filename] !~ /\.csv$/
+        bad_request_error "Wrong file extension for '#{params[:fileselect][:filename]}'. Please upload a CSV file."
       end
-      substring = w.match(/rows .* Entries/)
-      unless substring.nil?
-        lines = []
-        substring[0].split(",").each{|s| lines << s[/\d+/]}
-        lines.shift
-        lines.each{|l| dupEntries[l.to_i] = w.split(".").first}
+      @filename = params[:fileselect][:filename]
+      begin
+        @dataset = Batch.find_by(:name => params[:fileselect][:filename].sub(/\.csv$/,""))
+        if @dataset
+          $logger.debug "Take file from database."
+          @compounds = @dataset.compounds
+          @identifiers = @dataset.identifiers
+        else
+          File.open('tmp/' + params[:fileselect][:filename], "w") do |f|
+            f.write(params[:fileselect][:tempfile].read)
+          end
+          input = Batch.from_csv_file File.join("tmp", params[:fileselect][:filename])
+          $logger.debug "Processing '#{params[:fileselect][:filename]}'"
+          if input.class == OpenTox::Batch
+            @dataset = input
+            @compounds = @dataset.compounds
+            @identifiers = @dataset.identifiers
+          else
+            File.delete File.join("tmp", params[:fileselect][:filename])
+            bad_request_error "Could not serialize file '#{@filename}'."
+          end
+        end
+      rescue
+        File.delete File.join("tmp", params[:fileselect][:filename])
+        bad_request_error "Could not serialize file '#{@filename}'."
       end
-    end
 
-    @batch.each_with_index do |hash, idx|
-      @csvhash[idx] = ""
-      model = hash[0]
-      # create header
-      if model.regression?
-        predAunit = "(#{model.unit})"
-        predBunit = "(#{model.unit =~ /mmol\/L/ ? "(mol/L)" : "(mg/kg_bw/day)"})"
-        @csvhash[idx] = "\"ID\",\"Endpoint\",\"Type\",\"Unique SMILES\",\"Prediction #{predAunit}\",\"Prediction #{predBunit}\",\"95% Prediction interval (low) #{predAunit}\",\"95% Prediction interval (high) #{predAunit}\",\"95% Prediction interval (low) #{predBunit}\",\"95% Prediction interval (high) #{predBunit}\",\"inApplicabilityDomain\",\"inTrainningSet\",\"Note\"\n"
-      else #classification
-        av = model.prediction_feature.accept_values
-        probFirst = av[0].capitalize
-        probLast = av[1].capitalize
-        @csvhash[idx] = "\"ID\",\"Endpoint\",\"Type\",\"Unique SMILES\",\"Prediction\",\"predProbability#{probFirst}\",\"predProbability#{probLast}\",\"inApplicabilityDomain\",\"inTrainningSet\",\"Note\"\n"
+      if @compounds.size == 0
+        message = @dataset.warnings
+        @dataset.delete
+        bad_request_error message
       end
-      values = hash[1]
-      dupEntries.keys.each{|k| values.insert(k-1, dupEntries[k])}.compact!
-      
-      values.each_with_index do |array, id|
-        type = (model.regression? ? "Regression" : "Classification")
-        endpoint = "#{model.endpoint.gsub('_', ' ')} (#{model.species})"
+    end
       
-        if id == 0
-          @csvhash[idx] += delEntries unless delEntries.blank?
+    @models = params[:selection].keys
+    # for single predictions in batch
+    @tasks = []
+    @models.each{|m| t = Task.new; t.save; @tasks << t}
+    @predictions = {}
+    task = Task.run do
+      @models.each_with_index do |model,idx|
+        t = @tasks[idx]
+        m = Model::Validation.find model
+        type = (m.regression? ? "Regression" : "Classification")
+        # add header for regression
+        if type == "Regression"
+          unit = (type == "Regression") ? "(#{m.unit})" : ""
+          converted_unit = (type == "Regression") ? "#{m.unit =~ /\b(mmol\/L)\b/ ? "(mg/L)" : "(mg/kg_bw/day)"}" : ""
+          header = "ID,Input,Endpoint,Unique SMILES,inTrainingSet,Measurements #{unit},Prediction #{unit},Prediction #{converted_unit},"\
+            "Prediction Interval Low #{unit},Prediction Interval High #{unit},"\
+            "Prediction Interval Low #{converted_unit},Prediction Interval High #{converted_unit},"\
+            "inApplicabilityDomain,Note\n"
         end
-        unless array.kind_of? String
-          compound = array[0]
-          prediction = array[1]
-          smiles = compound.smiles
-          
-          if prediction[:neighbors]
-            if prediction[:value]
-              pred = prediction[:value].numeric? ? "#{prediction[:value].delog10.signif(3)}" : prediction[:value]
-              predA = prediction[:value].numeric? ? "#{prediction[:value].delog10.signif(3)}" : prediction[:value]
-              predAunit = prediction[:value].numeric? ? "(#{model.unit})" : ""
-              predB = prediction[:value].numeric? ? "#{compound.mmol_to_mg(prediction[:value].delog10).signif(3)}" : prediction[:value]
-              predBunit = prediction[:value].numeric? ? "#{model.unit =~ /\b(mmol\/L)\b/ ? "(mg/L)" : "(mg/kg_bw/day)"}" : ""
-              int = (prediction[:prediction_interval].nil? ? nil : prediction[:prediction_interval])
-              intervalLow = (int.nil? ? "" : "#{int[1].delog10.signif(3)}")
-              intervalHigh = (int.nil? ? "" : "#{int[0].delog10.signif(3)}")
-              intervalLowMg = (int.nil? ? "" : "#{compound.mmol_to_mg(int[1].delog10).signif(3)}")
-              intervalHighMg = (int.nil? ? "" : "#{compound.mmol_to_mg(int[0].delog10).signif(3)}")
-              inApp = "yes"
-              inT = prediction[:info] =~ /\b(identical)\b/i ? "yes" : "no"
-              note = prediction[:warnings].join("\n") + ( prediction[:info] ? prediction[:info].sub(/\'.*\'/,"") : "\n" )
-              
-              unless prediction[:probabilities].nil?
-                av = model.prediction_feature.accept_values
-                propA = "#{prediction[:probabilities][av[0]].to_f.signif(3)}"
-                propB = "#{prediction[:probabilities][av[1]].to_f.signif(3)}"
-              end
-            else
-              # no prediction value only one neighbor
-              inApp = "no"
-              inT = prediction[:info] =~ /\b(identical)\b/i ? "yes" : "no"
-              note = prediction[:warnings].join("\n") + ( prediction[:info] ? prediction[:info].sub(/\'.*\'/,"") : "\n" )
+        # add header for classification
+        if type == "Classification"
+          av = m.prediction_feature.accept_values
+          header = "ID,Input,Endpoint,Unique SMILES,inTrainingSet,Measurements,Consensus Prediction,Consensus Confidence,"\
+            "Structural alerts for mutagenicity,Lazar Prediction,"\
+            "Lazar predProbability #{av[0]},Lazar predProbability #{av[1]},inApplicabilityDomain,Note\n"
+        end
+        # predict compounds
+        p = 100.0/@compounds.size
+        counter = 1
+        predictions = []
+        @compounds.each_with_index do |cid,idx|
+          compound = Compound.find cid
+          if Prediction.where(compound: compound.id, model: m.id).exists?
+            prediction_object = Prediction.find_by(compound: compound.id, model: m.id)
+            prediction = prediction_object.prediction
+            prediction_id = prediction_object.id
+            # in case prediction object was created by single prediction
+            if prediction_object.csv.blank?
+              prediction_object[:csv] = prediction_to_csv(m,compound,prediction)
+              prediction_object.save
             end
+            # identifier
+            identifier = @identifiers[idx]
           else
-            # no prediction value
-            inApp = "no"
-            inT = prediction[:info] =~ /\b(identical)\b/i ? "yes" : "no"
-            note = prediction[:warnings].join("\n") + ( prediction[:info] ? prediction[:info].sub(/\'.*\'/,"") : "\n" )
-          end
-          if @warnings
-            @warnings.each do |w|
-              note += (w.split(".").first + ".") if /\b(#{Regexp.escape(smiles)})\b/ === w
+            prediction = m.predict(compound)
+            # save prediction object
+            prediction_object = Prediction.new
+            prediction_id = prediction_object.id
+            prediction_object[:compound] = compound.id
+            prediction_object[:model] = m.id
+            # add additionally fields for html representation
+            unless prediction[:value].blank? || type == "Classification"
+              prediction[:prediction_value] = "#{prediction[:value].delog10.signif(3)} #{unit}"
+              prediction["converted_prediction_value"] = "#{compound.mmol_to_mg(prediction[:value].delog10).signif(3)} #{converted_unit}"
             end
+            unless prediction[:prediction_interval].blank?
+              interval = prediction[:prediction_interval]
+              prediction[:interval] = "#{interval[1].delog10.signif(3)} - #{interval[0].delog10.signif(3)} #{unit}"
+              prediction[:converted_interval] = "#{compound.mmol_to_mg(interval[1].delog10).signif(3)} - #{compound.mmol_to_mg(interval[0].delog10).signif(3)} #{converted_unit}"
+            end
+            prediction["unit"] = unit
+            prediction["converted_unit"] = converted_unit
+            if prediction[:measurements].is_a?(Array)
+              prediction["measurements_string"] = (type == "Regression") ? prediction[:measurements].collect{|value| "#{value.delog10.signif(3)} #{unit}"} : prediction[:measurements].join("</br>")
+              prediction["converted_measurements"] = prediction[:measurements].collect{|value| "#{compound.mmol_to_mg(value.delog10).signif(3)} #{unit =~ /mmol\/L/ ? "(mg/L)" : "(mg/kg_bw/day)"}"} if type == "Regression"
+            else
+              output["measurements_string"] = (type == "Regression") ? "#{prediction[:measurements].delog10.signif(3)} #{unit}}" : prediction[:measurements]
+              output["converted_measurements"] = "#{compound.mmol_to_mg(prediction[:measurements].delog10).signif(3)} #{(unit =~ /\b(mmol\/L)\b/) ? "(mg/L)" : "(mg/kg_bw/day)"}" if type == "Regression"
+            end
+
+            # store in prediction_object
+            prediction_object[:prediction] = prediction
+            prediction_object[:csv] = prediction_to_csv(m,compound,prediction)
+            prediction_object.save
+
+            # identifier
+            identifier = @identifiers[idx]
           end
-        else
-          # string note for duplicates
-          endpoint = type = smiles = pred = predA = predB = propA = propB = intervalLow = intervalHigh = intervalLowMg = intervalHighMg = inApp = inT = ""
-          note = array
-        end
-        if model.regression?
-          @csvhash[idx] += "\"#{id+1}\",\"#{endpoint}\",\"#{type}\",\"#{smiles}\",\"#{predA}\",\"#{predB}\",\"#{intervalLow}\",\"#{intervalHigh}\",\"#{intervalLowMg}\",\"#{intervalHighMg}\",\"#{inApp}\",\"#{inT}\",\"#{note.chomp}\"\n"
-        else
-          @csvhash[idx] += "\"#{id+1}\",\"#{endpoint}\",\"#{type}\",\"#{smiles}\",\"#{pred}\",\"#{propA}\",\"#{propB}\",\"#{inApp}\",\"#{inT}\",\"#{note.chomp}\"\n"
+          # collect prediction_object ids with identifier
+          predictions << {identifier => prediction_id}
+          t.update_percent((counter*p).ceil > 100 ? 100 : (counter*p).ceil)
+          counter += 1
         end
-      end
-    end
-    t = Tempfile.new
-    @csvhash.each do |model, csv|
-      t.write(csv)
-      t.write("\n")
-    end
-    t.rewind
-    @tmppath = t.path.split("/").last
+        # write csv
+        t[:csv] = header
+        # write predictions
+        @predictions["#{model}"] = predictions
+        # save task 
+        # append predictions as last action otherwise they won't save
+        # mongoid works with shallow copy via #dup
+        t[:predictions] = @predictions
+        t.save
+      end#models
+
+    end#main task
+    @pid = task.pid
 
-    dataset.delete
-    File.delete File.join("tmp", params[:fileselect][:filename])
+    #@dataset.delete
+    #File.delete File.join("tmp", params[:fileselect][:filename])
     return haml :batch
   end
 
+  # single compound prediction
   # validate identifier input
   if !params[:identifier].blank?
-    @identifier = params[:identifier]
+    @identifier = params[:identifier].strip
     $logger.debug "input:#{@identifier}"
     # get compound from SMILES
     @compound = Compound.from_smiles @identifier
     bad_request_error "'#{@identifier}' is not a valid SMILES string." if @compound.blank?
-
+    
     @models = []
     @predictions = []
     params[:selection].keys.each do |model_id|
-      model = OpenTox::Model::Validation.find model_id
+      model = Model::Validation.find model_id
       @models << model
-      @predictions << model.predict(@compound)
+      if Prediction.where(compound: @compound.id, model: model.id).exists?
+        prediction_object = Prediction.find_by(compound: @compound.id, model: model.id)
+        prediction = prediction_object.prediction
+        @predictions << prediction
+      else
+        prediction_object = Prediction.new
+        prediction = model.predict(@compound)
+        prediction_object[:compound] = @compound.id
+        prediction_object[:model] = model.id
+        prediction_object[:prediction] = prediction
+        prediction_object.save
+        @predictions << prediction
+      end
     end
+
     haml :prediction
   end
 end
 
-get "/report/:id/?" do
-  prediction_model = Model::Validation.find params[:id]
-  bad_request_error "model with id: '#{params[:id]}' not found." unless prediction_model
-  report = qmrf_report params[:id]
-  # output
-  t = Tempfile.new
-  t << report.to_xml
-  name = prediction_model.species.sub(/\s/,"-")+"-"+prediction_model.endpoint.downcase.sub(/\s/,"-")
-  send_file t.path, :filename => "QMRF_report_#{name.gsub!(/[^0-9A-Za-z]/, '_')}.xml", :type => "application/xml", :disposition => "attachment"
-end
-
-get '/license' do
-  @license = RDiscount.new(File.read("LICENSE.md")).to_html
-  haml :license, :layout => false
-end
-
-get '/faq' do
-  @faq = RDiscount.new(File.read("FAQ.md")).to_html
-  haml :faq, :layout => false
-end
-
 get '/style.css' do
   headers 'Content-Type' => 'text/css; charset=utf-8'
   scss :style
 end
-
diff --git a/helper.rb b/helper.rb
index 06b1517..c4c6d2b 100644
--- a/helper.rb
+++ b/helper.rb
@@ -109,8 +109,6 @@ helpers do
         line += "#{output['model_name']},#{compound.smiles},#{prediction[:info] ? prediction[:info] : "no"},"\
           "#{prediction[:measurements].collect{|m| m.delog10.signif(3)}.join("; ") if prediction[:info]},,,,,,,"+ [inApp,note].join(",")+"\n"
       else
-        #line += "Consensus mutagenicity,#{compound.smiles},#{prediction[:info] ? prediction[:info] : "no"},"\
-        #  "#{prediction[:measurements].join("; ") if prediction[:info]},,,,,,,"+ [inApp,note].join(",")+"\n"
         line += "Consensus mutagenicity,#{compound.smiles},"\
           "\"#{prediction[:info] ? prediction[:info] : "no"}\",\"#{output['measurements'].join("; ") if prediction[:info]}\","\
           "#{prediction['Consensus prediction']},"\
@@ -128,11 +126,4 @@ helpers do
     csv
   end
 
-  def dataset_storage
-    all = Batch.where(:source => /^tmp/)
-    out = Hash.new
-    all.reverse.each{|d| out[d.id] = [d.name, d.created_at]}
-    out
-  end  
-
 end
diff --git a/public/javascripts/pagination.min.js b/public/javascripts/pagination.min.js
new file mode 100644
index 0000000..89faf77
--- /dev/null
+++ b/public/javascripts/pagination.min.js
@@ -0,0 +1,11 @@
+/*
+ * pagination.js 2.0.7
+ * A jQuery plugin to provide simple yet fully customisable pagination
+ * https://github.com/superRaytin/paginationjs
+
+ * Homepage: http://paginationjs.com
+ *
+ * Copyright 2014-2100, superRaytin
+ * Released under the MIT license.
+*/
+!function(a,b){function c(a){throw new Error("Pagination: "+a)}function d(a){a.dataSource||c('"dataSource" is required.'),"string"==typeof a.dataSource?"undefined"==typeof a.totalNumber?c('"totalNumber" is required.'):b.isNumeric(a.totalNumber)||c('"totalNumber" is incorrect. (Number)'):j.isObject(a.dataSource)&&("undefined"==typeof a.locator?c('"dataSource" is an Object, please specify "locator".'):"string"==typeof a.locator||b.isFunction(a.locator)||c(""+a.locator+" is incorrect. (String | Function)"))}function e(a){var c=["go","previous","next","disable","enable","refresh","show","hide","destroy"];b.each(c,function(b,c){a.off(i+c)}),a.data("pagination",{}),b(".paginationjs",a).remove()}function f(a,b){return("object"==(b=typeof a)?null==a&&"null"||Object.prototype.toString.call(a).slice(8,-1):b).toLowerCase()}"undefined"==typeof b&&c("Pagination requires jQuery.");var g="pagination",h="addHook",i="__pagination-";b.fn.pagination&&(g="pagination2"),b.fn[g]=function(f){if("undefined"==typeof f)return this;var g=b(this),h={initialize:function(){var a=this;if(g.data("pagination")||g.data("pagination",{}),a.callHook("beforeInit")!==!1){g.data("pagination").initialized&&b(".paginationjs",g).remove(),a.disabled=!!l.disabled;var c=a.model={pageRange:l.pageRange,pageSize:l.pageSize};a.parseDataSource(l.dataSource,function(b){if(a.sync=j.isArray(b),a.sync&&(c.totalNumber=l.totalNumber=b.length),c.totalPage=a.getTotalPage(),!(l.hideWhenLessThanOnePage&&c.totalPage<=1)){var d=a.render(!0);l.className&&d.addClass(l.className),c.el=d,g["bottom"===l.position?"append":"prepend"](d),a.observer(),g.data("pagination").initialized=!0,a.callHook("afterInit",d)}})}},render:function(a){var c=this,d=c.model,e=d.el||b('<div class="paginationjs"></div>'),f=a!==!0;c.callHook("beforeRender",f);var g=d.pageNumber||l.pageNumber,h=l.pageRange,i=d.totalPage,j=g-h,k=g+h;return k>i&&(k=i,j=i-2*h,j=1>j?1:j),1>=j&&(j=1,k=Math.min(2*h+1,i)),e.html(c.createTemplate({currentPage:g,pageRange:h,totalPage:i,rangeStart:j,rangeEnd:k})),c.callHook("afterRender",f),e},createTemplate:function(a){var c,d,e=this,f=a.currentPage,g=a.totalPage,h=a.rangeStart,i=a.rangeEnd,j=l.totalNumber,k=l.showPrevious,m=l.showNext,n=l.showPageNumbers,o=l.showNavigator,p=l.showGoInput,q=l.showGoButton,r=l.pageLink,s=l.prevText,t=l.nextText,u=l.ellipsisText,v=l.goButtonText,w=l.classPrefix,x=l.activeClassName,y=l.disableClassName,z=l.ulClassName,A=b.isFunction(l.formatNavigator)?l.formatNavigator():l.formatNavigator,B=b.isFunction(l.formatGoInput)?l.formatGoInput():l.formatGoInput,C=b.isFunction(l.formatGoButton)?l.formatGoButton():l.formatGoButton,D=b.isFunction(l.autoHidePrevious)?l.autoHidePrevious():l.autoHidePrevious,E=b.isFunction(l.autoHideNext)?l.autoHideNext():l.autoHideNext,F=b.isFunction(l.header)?l.header():l.header,G=b.isFunction(l.footer)?l.footer():l.footer,H="",I='<input type="text" class="J-paginationjs-go-pagenumber">',J='<input type="button" class="J-paginationjs-go-button" value="'+v+'">';if(F&&(c=e.replaceVariables(F,{currentPage:f,totalPage:g,totalNumber:j}),H+=c),k||n||m){if(H+='<div class="paginationjs-pages">',H+=z?'<ul class="'+z+'">':"<ul>",k&&(1===f?D||(H+='<li class="'+w+"-prev "+y+'"><a>'+s+"</a></li>"):H+='<li class="'+w+'-prev J-paginationjs-previous" data-num="'+(f-1)+'" title="Previous page"><a href="'+r+'">'+s+"</a></li>"),n){if(3>=h)for(d=1;h>d;d++)H+=d==f?'<li class="'+w+"-page J-paginationjs-page "+x+'" data-num="'+d+'"><a>'+d+"</a></li>":'<li class="'+w+'-page J-paginationjs-page" data-num="'+d+'"><a href="'+r+'">'+d+"</a></li>";else l.showFirstOnEllipsisShow&&(H+='<li class="'+w+"-page "+w+'-first J-paginationjs-page" data-num="1"><a href="'+r+'">1</a></li>'),H+='<li class="'+w+"-ellipsis "+y+'"><a>'+u+"</a></li>";for(d=h;i>=d;d++)H+=d==f?'<li class="'+w+"-page J-paginationjs-page "+x+'" data-num="'+d+'"><a>'+d+"</a></li>":'<li class="'+w+'-page J-paginationjs-page" data-num="'+d+'"><a href="'+r+'">'+d+"</a></li>";if(i>=g-2)for(d=i+1;g>=d;d++)H+='<li class="'+w+'-page J-paginationjs-page" data-num="'+d+'"><a href="'+r+'">'+d+"</a></li>";else H+='<li class="'+w+"-ellipsis "+y+'"><a>'+u+"</a></li>",l.showLastOnEllipsisShow&&(H+='<li class="'+w+"-page "+w+'-last J-paginationjs-page" data-num="'+g+'"><a href="'+r+'">'+g+"</a></li>")}m&&(f==g?E||(H+='<li class="'+w+"-next "+y+'"><a>'+t+"</a></li>"):H+='<li class="'+w+'-next J-paginationjs-next" data-num="'+(f+1)+'" title="Next page"><a href="'+r+'">'+t+"</a></li>"),H+="</ul></div>"}return o&&A&&(c=e.replaceVariables(A,{currentPage:f,totalPage:g,totalNumber:j}),H+='<div class="'+w+'-nav J-paginationjs-nav">'+c+"</div>"),p&&B&&(c=e.replaceVariables(B,{currentPage:f,totalPage:g,totalNumber:j,input:I}),H+='<div class="'+w+'-go-input">'+c+"</div>"),q&&C&&(c=e.replaceVariables(C,{currentPage:f,totalPage:g,totalNumber:j,button:J}),H+='<div class="'+w+'-go-button">'+c+"</div>"),G&&(c=e.replaceVariables(G,{currentPage:f,totalPage:g,totalNumber:j}),H+=c),H},go:function(a,c){function d(a){if(e.callHook("beforePaging",h)===!1)return!1;if(f.direction="undefined"==typeof f.pageNumber?0:h>f.pageNumber?1:-1,f.pageNumber=h,e.render(),e.disabled&&!e.sync&&e.enable(),g.data("pagination").model=f,b.isFunction(l.formatResult)){var d=b.extend(!0,[],a);j.isArray(a=l.formatResult(d))||(a=d)}g.data("pagination").currentPageData=a,e.doCallback(a,c),e.callHook("afterPaging",h),1==h&&e.callHook("afterIsFirstPage"),h==f.totalPage&&e.callHook("afterIsLastPage")}var e=this,f=e.model;if(!e.disabled){var h=a,i=l.pageSize,k=f.totalPage;if(h=parseInt(h),!(!h||1>h||h>k)){if(e.sync)return void d(e.getDataSegment(h));var m={},n=l.alias||{};m[n.pageSize?n.pageSize:"pageSize"]=i,m[n.pageNumber?n.pageNumber:"pageNumber"]=h;var o={type:"get",cache:!1,data:{},contentType:"application/x-www-form-urlencoded; charset=UTF-8",dataType:"json",async:!0};b.extend(!0,o,l.ajax),b.extend(o.data||{},m),o.url=l.dataSource,o.success=function(a){d(e.filterDataByLocator(a))},o.error=function(a,b,c){l.formatAjaxError&&l.formatAjaxError(a,b,c),e.enable()},e.disable(),b.ajax(o)}}},doCallback:function(a,c){var d=this,e=d.model;b.isFunction(c)?c(a,e):b.isFunction(l.callback)&&l.callback(a,e)},destroy:function(){this.callHook("beforeDestroy")!==!1&&(this.model.el.remove(),g.off(),b("#paginationjs-style").remove(),this.callHook("afterDestroy"))},previous:function(a){this.go(this.model.pageNumber-1,a)},next:function(a){this.go(this.model.pageNumber+1,a)},disable:function(){var a=this,b=a.sync?"sync":"async";a.callHook("beforeDisable",b)!==!1&&(a.disabled=!0,a.model.disabled=!0,a.callHook("afterDisable",b))},enable:function(){var a=this,b=a.sync?"sync":"async";a.callHook("beforeEnable",b)!==!1&&(a.disabled=!1,a.model.disabled=!1,a.callHook("afterEnable",b))},refresh:function(a){this.go(this.model.pageNumber,a)},show:function(){var a=this;a.model.el.is(":visible")||a.model.el.show()},hide:function(){var a=this;a.model.el.is(":visible")&&a.model.el.hide()},replaceVariables:function(a,b){var c;for(var d in b){var e=b[d],f=new RegExp("<%=\\s*"+d+"\\s*%>","img");c=(c||a).replace(f,e)}return c},getDataSegment:function(a){var b=l.pageSize,c=l.dataSource,d=l.totalNumber,e=b*(a-1)+1,f=Math.min(a*b,d);return c.slice(e-1,f)},getTotalPage:function(){return Math.ceil(l.totalNumber/l.pageSize)},getLocator:function(a){var d;return"string"==typeof a?d=a:b.isFunction(a)?d=a():c('"locator" is incorrect. (String | Function)'),d},filterDataByLocator:function(a){var d,e=this.getLocator(l.locator);if(j.isObject(a)){try{b.each(e.split("."),function(b,c){d=(d?d:a)[c]})}catch(f){}d?j.isArray(d)||c("dataSource."+e+" must be an Array."):c("dataSource."+e+" is undefined.")}return d||a},parseDataSource:function(a,d){var e=this,f=arguments;j.isObject(a)?d(l.dataSource=e.filterDataByLocator(a)):j.isArray(a)?d(l.dataSource=a):b.isFunction(a)?l.dataSource(function(a){b.isFunction(a)&&c('Unexpect parameter of the "done" Function.'),f.callee.call(e,a,d)}):"string"==typeof a?(/^https?|file:/.test(a)&&(l.ajaxDataType="jsonp"),d(a)):c('Unexpect data type of the "dataSource".')},callHook:function(c){var d,e=g.data("pagination"),f=Array.prototype.slice.apply(arguments);return f.shift(),l[c]&&b.isFunction(l[c])&&l[c].apply(a,f)===!1&&(d=!1),e.hooks&&e.hooks[c]&&b.each(e.hooks[c],function(b,c){c.apply(a,f)===!1&&(d=!1)}),d!==!1},observer:function(){var a=this,d=a.model.el;g.on(i+"go",function(d,e,f){e=parseInt(b.trim(e)),e&&(b.isNumeric(e)||c('"pageNumber" is incorrect. (Number)'),a.go(e,f))}),d.delegate(".J-paginationjs-page","click",function(c){var d=b(c.currentTarget),e=b.trim(d.attr("data-num"));return!e||d.hasClass(l.disableClassName)||d.hasClass(l.activeClassName)?void 0:a.callHook("beforePageOnClick",c,e)===!1?!1:(a.go(e),a.callHook("afterPageOnClick",c,e),l.pageLink?void 0:!1)}),d.delegate(".J-paginationjs-previous","click",function(c){var d=b(c.currentTarget),e=b.trim(d.attr("data-num"));return e&&!d.hasClass(l.disableClassName)?a.callHook("beforePreviousOnClick",c,e)===!1?!1:(a.go(e),a.callHook("afterPreviousOnClick",c,e),l.pageLink?void 0:!1):void 0}),d.delegate(".J-paginationjs-next","click",function(c){var d=b(c.currentTarget),e=b.trim(d.attr("data-num"));return e&&!d.hasClass(l.disableClassName)?a.callHook("beforeNextOnClick",c,e)===!1?!1:(a.go(e),a.callHook("afterNextOnClick",c,e),l.pageLink?void 0:!1):void 0}),d.delegate(".J-paginationjs-go-button","click",function(){var c=b(".J-paginationjs-go-pagenumber",d).val();return a.callHook("beforeGoButtonOnClick",event,c)===!1?!1:(g.trigger(i+"go",c),void a.callHook("afterGoButtonOnClick",event,c))}),d.delegate(".J-paginationjs-go-pagenumber","keyup",function(c){if(13===c.which){var e=b(c.currentTarget).val();if(a.callHook("beforeGoInputOnEnter",c,e)===!1)return!1;g.trigger(i+"go",e),b(".J-paginationjs-go-pagenumber",d).focus(),a.callHook("afterGoInputOnEnter",c,e)}}),g.on(i+"previous",function(b,c){a.previous(c)}),g.on(i+"next",function(b,c){a.next(c)}),g.on(i+"disable",function(){a.disable()}),g.on(i+"enable",function(){a.enable()}),g.on(i+"refresh",function(b,c){a.refresh(c)}),g.on(i+"show",function(){a.show()}),g.on(i+"hide",function(){a.hide()}),g.on(i+"destroy",function(){a.destroy()}),l.triggerPagingOnInit&&g.trigger(i+"go",Math.min(l.pageNumber,a.model.totalPage))}};if(g.data("pagination")&&g.data("pagination").initialized===!0){if(b.isNumeric(f))return g.trigger.call(this,i+"go",f,arguments[1]),this;if("string"==typeof f){var k=Array.prototype.slice.apply(arguments);switch(k[0]=i+k[0],f){case"previous":case"next":case"go":case"disable":case"enable":case"refresh":case"show":case"hide":case"destroy":g.trigger.apply(this,k);break;case"getSelectedPageNum":return g.data("pagination").model?g.data("pagination").model.pageNumber:g.data("pagination").attributes.pageNumber;case"getTotalPage":return g.data("pagination").model.totalPage;case"getSelectedPageData":return g.data("pagination").currentPageData;case"isDisabled":return g.data("pagination").model.disabled===!0;default:c("Pagination do not provide action: "+f)}return this}e(g)}else j.isObject(f)||c("Illegal options");var l=b.extend({},arguments.callee.defaults,f);return d(l),h.initialize(),this},b.fn[g].defaults={totalNumber:1,pageNumber:1,pageSize:10,pageRange:2,showPrevious:!0,showNext:!0,showPageNumbers:!0,showNavigator:!1,showGoInput:!1,showGoButton:!1,pageLink:"",prevText:"&laquo;",nextText:"&raquo;",ellipsisText:"...",goButtonText:"Go",classPrefix:"paginationjs",activeClassName:"active",disableClassName:"disabled",inlineStyle:!0,formatNavigator:"<%= currentPage %> / <%= totalPage %>",formatGoInput:"<%= input %>",formatGoButton:"<%= button %>",position:"bottom",autoHidePrevious:!1,autoHideNext:!1,triggerPagingOnInit:!0,hideWhenLessThanOnePage:!1,showFirstOnEllipsisShow:!0,showLastOnEllipsisShow:!0,callback:function(){}},b.fn[h]=function(a,d){arguments.length<2&&c("Missing argument."),b.isFunction(d)||c("callback must be a function.");var e=b(this),f=e.data("pagination");f||(e.data("pagination",{}),f=e.data("pagination")),!f.hooks&&(f.hooks={}),f.hooks[a]=f.hooks[a]||[],f.hooks[a].push(d)},b[g]=function(a,d){arguments.length<2&&c("Requires two parameters.");var e;return e="string"!=typeof a&&a instanceof jQuery?a:b(a),e.length?(e.pagination(d),e):void 0};var j={};b.each(["Object","Array"],function(a,b){j["is"+b]=function(a){return f(a)===b.toLowerCase()}}),"function"==typeof define&&define.amd&&define(function(){return b})}(this,window.jQuery);
\ No newline at end of file
diff --git a/public/stylesheets/pagination.css b/public/stylesheets/pagination.css
new file mode 100644
index 0000000..117bf0b
--- /dev/null
+++ b/public/stylesheets/pagination.css
@@ -0,0 +1 @@
+.paginationjs{line-height:1.6;font-family:Marmelad,"Lucida Grande",Arial,"Hiragino Sans GB",Georgia,sans-serif;font-size:14px;box-sizing:initial}.paginationjs:after{display:table;content:" ";clear:both}.paginationjs .paginationjs-pages{float:left}.paginationjs .paginationjs-pages ul{float:left;margin:0;padding:0}.paginationjs .paginationjs-go-button,.paginationjs .paginationjs-go-input,.paginationjs .paginationjs-nav{float:left;margin-left:10px;font-size:14px}.paginationjs .paginationjs-pages li{float:left;border:1px solid #aaa;border-right:none;list-style:none}.paginationjs .paginationjs-pages li>a{min-width:30px;height:28px;line-height:28px;display:block;background:#fff;font-size:14px;color:#333;text-decoration:none;text-align:center}.paginationjs .paginationjs-pages li>a:hover{background:#eee}.paginationjs .paginationjs-pages li.active{border:none}.paginationjs .paginationjs-pages li.active>a{height:30px;line-height:30px;background:#aaa;color:#fff}.paginationjs .paginationjs-pages li.disabled>a{opacity:.3}.paginationjs .paginationjs-pages li.disabled>a:hover{background:0 0}.paginationjs .paginationjs-pages li:first-child,.paginationjs .paginationjs-pages li:first-child>a{border-radius:3px 0 0 3px}.paginationjs .paginationjs-pages li:last-child{border-right:1px solid #aaa;border-radius:0 3px 3px 0}.paginationjs .paginationjs-pages li:last-child>a{border-radius:0 3px 3px 0}.paginationjs .paginationjs-go-input>input[type=text]{width:30px;height:28px;background:#fff;border-radius:3px;border:1px solid #aaa;padding:0;font-size:14px;text-align:center;vertical-align:baseline;outline:0;box-shadow:none;box-sizing:initial}.paginationjs .paginationjs-go-button>input[type=button]{min-width:40px;height:30px;line-height:28px;background:#fff;border-radius:3px;border:1px solid #aaa;text-align:center;padding:0 8px;font-size:14px;vertical-align:baseline;outline:0;box-shadow:none;color:#333;cursor:pointer;vertical-align:middle\9}.paginationjs.paginationjs-theme-blue .paginationjs-go-input>input[type=text],.paginationjs.paginationjs-theme-blue .paginationjs-pages li{border-color:#289de9}.paginationjs .paginationjs-go-button>input[type=button]:hover{background-color:#f8f8f8}.paginationjs .paginationjs-nav{height:30px;line-height:30px}.paginationjs .paginationjs-go-button,.paginationjs .paginationjs-go-input{margin-left:5px\9}.paginationjs.paginationjs-small{font-size:12px}.paginationjs.paginationjs-small .paginationjs-pages li>a{min-width:26px;height:24px;line-height:24px;font-size:12px}.paginationjs.paginationjs-small .paginationjs-pages li.active>a{height:26px;line-height:26px}.paginationjs.paginationjs-small .paginationjs-go-input{font-size:12px}.paginationjs.paginationjs-small .paginationjs-go-input>input[type=text]{width:26px;height:24px;font-size:12px}.paginationjs.paginationjs-small .paginationjs-go-button{font-size:12px}.paginationjs.paginationjs-small .paginationjs-go-button>input[type=button]{min-width:30px;height:26px;line-height:24px;padding:0 6px;font-size:12px}.paginationjs.paginationjs-small .paginationjs-nav{height:26px;line-height:26px;font-size:12px}.paginationjs.paginationjs-big{font-size:16px}.paginationjs.paginationjs-big .paginationjs-pages li>a{min-width:36px;height:34px;line-height:34px;font-size:16px}.paginationjs.paginationjs-big .paginationjs-pages li.active>a{height:36px;line-height:36px}.paginationjs.paginationjs-big .paginationjs-go-input{font-size:16px}.paginationjs.paginationjs-big .paginationjs-go-input>input[type=text]{width:36px;height:34px;font-size:16px}.paginationjs.paginationjs-big .paginationjs-go-button{font-size:16px}.paginationjs.paginationjs-big .paginationjs-go-button>input[type=button]{min-width:50px;height:36px;line-height:34px;padding:0 12px;font-size:16px}.paginationjs.paginationjs-big .paginationjs-nav{height:36px;line-height:36px;font-size:16px}.paginationjs.paginationjs-theme-blue .paginationjs-pages li>a{color:#289de9}.paginationjs.paginationjs-theme-blue .paginationjs-pages li>a:hover{background:#e9f4fc}.paginationjs.paginationjs-theme-blue .paginationjs-pages li.active>a{background:#289de9;color:#fff}.paginationjs.paginationjs-theme-blue .paginationjs-pages li.disabled>a:hover{background:0 0}.paginationjs.paginationjs-theme-blue .paginationjs-go-button>input[type=button]{background:#289de9;border-color:#289de9;color:#fff}.paginationjs.paginationjs-theme-green .paginationjs-go-input>input[type=text],.paginationjs.paginationjs-theme-green .paginationjs-pages li{border-color:#449d44}.paginationjs.paginationjs-theme-blue .paginationjs-go-button>input[type=button]:hover{background-color:#3ca5ea}.paginationjs.paginationjs-theme-green .paginationjs-pages li>a{color:#449d44}.paginationjs.paginationjs-theme-green .paginationjs-pages li>a:hover{background:#ebf4eb}.paginationjs.paginationjs-theme-green .paginationjs-pages li.active>a{background:#449d44;color:#fff}.paginationjs.paginationjs-theme-green .paginationjs-pages li.disabled>a:hover{background:0 0}.paginationjs.paginationjs-theme-green .paginationjs-go-button>input[type=button]{background:#449d44;border-color:#449d44;color:#fff}.paginationjs.paginationjs-theme-yellow .paginationjs-go-input>input[type=text],.paginationjs.paginationjs-theme-yellow .paginationjs-pages li{border-color:#ec971f}.paginationjs.paginationjs-theme-green .paginationjs-go-button>input[type=button]:hover{background-color:#55a555}.paginationjs.paginationjs-theme-yellow .paginationjs-pages li>a{color:#ec971f}.paginationjs.paginationjs-theme-yellow .paginationjs-pages li>a:hover{background:#fdf5e9}.paginationjs.paginationjs-theme-yellow .paginationjs-pages li.active>a{background:#ec971f;color:#fff}.paginationjs.paginationjs-theme-yellow .paginationjs-pages li.disabled>a:hover{background:0 0}.paginationjs.paginationjs-theme-yellow .paginationjs-go-button>input[type=button]{background:#ec971f;border-color:#ec971f;color:#fff}.paginationjs.paginationjs-theme-red .paginationjs-go-input>input[type=text],.paginationjs.paginationjs-theme-red .paginationjs-pages li{border-color:#c9302c}.paginationjs.paginationjs-theme-yellow .paginationjs-go-button>input[type=button]:hover{background-color:#eea135}.paginationjs.paginationjs-theme-red .paginationjs-pages li>a{color:#c9302c}.paginationjs.paginationjs-theme-red .paginationjs-pages li>a:hover{background:#faeaea}.paginationjs.paginationjs-theme-red .paginationjs-pages li.active>a{background:#c9302c;color:#fff}.paginationjs.paginationjs-theme-red .paginationjs-pages li.disabled>a:hover{background:0 0}.paginationjs.paginationjs-theme-red .paginationjs-go-button>input[type=button]{background:#c9302c;border-color:#c9302c;color:#fff}.paginationjs.paginationjs-theme-red .paginationjs-go-button>input[type=button]:hover{background-color:#ce4541}.paginationjs .paginationjs-pages li.paginationjs-next{border-right:1px solid #aaa\9}.paginationjs .paginationjs-go-input>input[type=text]{line-height:28px\9;vertical-align:middle\9}.paginationjs.paginationjs-big .paginationjs-pages li>a{line-height:36px\9}.paginationjs.paginationjs-big .paginationjs-go-input>input[type=text]{height:36px\9;line-height:36px\9}
\ No newline at end of file
diff --git a/views/batch.haml b/views/batch.haml
index 7f6ddb7..e532e9d 100644
--- a/views/batch.haml
+++ b/views/batch.haml
@@ -29,16 +29,11 @@
     var aClient = new HttpClient();
     aClient.get(uri, function(res) {
       var response = JSON.parse(res);
-      if (model_id == "Cramer"){
-        $("img.circle").show();
-      }else{
-        progress(response['percent'],id);
-      }
+      progress(response['percent'],id);
       if (response['percent'] == 100){
         window.clearInterval(markers[id]);
         $("a#downbutton_"+id).removeClass("disabled");
         $("a#detailsbutton_"+id).removeClass("disabled");
-        $("img.circle").hide();
       };
     });
   };
diff --git a/views/layout.haml b/views/layout.haml
index 9b13e2f..647282c 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -10,12 +10,14 @@
     %link{:rel=>'stylesheet', :href=>"#{'/css/theme.default.min.css'}"}
     %link{:rel=>'stylesheet', :href=>"#{'/css/theme.bootstrap.min.css'}"}
     %link{ :href=>"/style.css", :rel=>"stylesheet"}
+    %link{:href=>"/stylesheets/pagination.css", :rel=>"stylesheet"}
     %link{ :href=>"/stylesheets/jquery-ui.css", :rel=>"stylesheet"}
     %script{:src=>"/javascripts/jquery-1.11.2.min.js"}
     %script{:src=>"/javascripts/bootstrap.min.js"}
     %script{:src=>"/javascripts/jquery.tablesorter.min.js"}
     %script{:src=>"/javascripts/jquery.tablesorter.widgets.js"}
     %script{:src=>"/javascripts/lazar-gui.js"}
+    %script{:src=>"/javascripts/pagination.min.js"}
     %script{:src=>"/javascripts/google_analytics_lazar.js"}
   %body
     %noscript
diff --git a/views/style.scss b/views/style.scss
index a23bb5d..fc6f8f2 100644
--- a/views/style.scss
+++ b/views/style.scss
@@ -26,6 +26,10 @@
 }
 body {
   background-color:#E7E7E7;
+  
+  a {
+    color: inherit;
+  }
 }
 table.table-borderless tbody tr td{
   border-top: none;
@@ -41,7 +45,7 @@ h4.head-back, h5.head-back{
   }
 
   li a {
-    //height: 7em;
+    height: 7em;
   }
 }
 img {
@@ -89,7 +93,30 @@ supporters{
     margin: 1em;
   }
 }
-
+.csv.btn{
+  width: 100%;
+  height: 30px;
+}
+.dlwait{
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+.single-batch{
+  width: 100%;
+}
+.single-batch{
+  table-layout: fixed;
+  width: 100%;
+}
+tr.hide-top > td {
+  border-top: 0px !important;
+}
 .footer{
   margin-top:3em;
 }
+.storage-list {
+    height: 400px;
+    overflow-y: auto;
+    overflow-x: auto;
+}