diff --git a/invivos/app.R b/invivos/app.R
index 25c1595..5f0d506 100644
--- a/invivos/app.R
+++ b/invivos/app.R
@@ -239,12 +239,13 @@ server <- function(input, output) {
           template<-template[order(template$Timepoint, template$Cage, template$`ID animal`, template$`ID tumor`),]
           template["TS"]<-rep(c("TS-Length", "TS-Width", "TS-Deep"), nrow(template)/3)
           dtemplate<-dcast(template, Cage+`ID animal`+`ID tumor`+Group+TS~Timepoint) 
+          dtemplate<-dtemplate[,mixedorder(dtemplate$`ID animal`, dtemplate$`ID tumor`, dtemplate$TS)]
         }
         if (input$measure_sys == "Min-Max"){
           template<-rbind(template, template)
           template<-template[order(template$Timepoint, template$Cage, template$`ID animal`, template$`ID tumor`),]
           template["DPV"]<-rep(c("Major", "Minor"), nrow(template)/2)
-          dtemplate<-dcast(template, Cage+`ID animal`+`ID tumor`+Group+DPV~Timepoint)  
+          dtemplate<-dcast(template, Cage+`ID animal`+`ID tumor`+Group+DPV~Timepoint)
         }
         dtemplate[,6:ncol(dtemplate)]<-""
       }