diff --git a/program/shinyApp/R/enrichment_analysis/server.R b/program/shinyApp/R/enrichment_analysis/server.R
index bb6387a4..7bae60b5 100644
--- a/program/shinyApp/R/enrichment_analysis/server.R
+++ b/program/shinyApp/R/enrichment_analysis/server.R
@@ -6,6 +6,7 @@ enrichment_analysis_geneset_server <- function(
     function(input,output,session){
       file_path <- paste0("/www/",session$token,"/")
       if(is.null(result)){
+        output$EnrichmentInfo <- renderText("Press 'Get Enrichment Analysis' to start. Note that this analysis is only meaningful for gene sets at the moment.")
         output$EnrichmentFailure <- renderText("Currently there is no result to display.")
         hideElement(id = "EnrichmentPlot")
         hideElement(id = "only2Report")
diff --git a/program/shinyApp/R/enrichment_analysis/ui.R b/program/shinyApp/R/enrichment_analysis/ui.R
index 47140185..c5b79442 100644
--- a/program/shinyApp/R/enrichment_analysis/ui.R
+++ b/program/shinyApp/R/enrichment_analysis/ui.R
@@ -6,6 +6,7 @@ geneset_panel_UI <- function(
 
   tabPanel(
     title = id_wo_ns,
+    textOutput(outputId = ns("EnrichmentInfo"), container = pre),
     tabsetPanel(
       tabPanel(
         title = paste(id_wo_ns, " Enrichment"),
@@ -119,7 +120,7 @@ ea_sidebar <- function(ns){
 
 ea_main <- function(ns){
   mainPanel(
-    textOutput(outputId = ns("EnrichmentInfo"), container = pre),
+   
     tabsetPanel(
       id = ns("EnrichmentTabs"),
       geneset_panel_UI(ns("Hallmarks")),
@@ -194,7 +195,6 @@ enrichment_analysis_UI <- function(id){
     #########################################
     # Enrichment
     #########################################
-    h4("NOTE THAT THIS ONLY MAKES SENSE FOR TRANSCRIPTOMICS DATA AT THE MOMENT!"),
     ea_sidebar(ns),
     ea_main(ns),
   )
diff --git a/program/shinyApp/R/heatmap/server.R b/program/shinyApp/R/heatmap/server.R
index 86766ea1..fffbe205 100644
--- a/program/shinyApp/R/heatmap/server.R
+++ b/program/shinyApp/R/heatmap/server.R
@@ -107,6 +107,10 @@ heatmap_server <- function(id, data, params, updates){
           )
         })
       })
+      
+      output$Heatmap_Info <- renderText({
+        "Press 'Get Heatmap' to start!"
+      })
 
       ## Do Heatmap
       toListen2Heatmap <- reactive({
@@ -196,6 +200,7 @@ heatmap_server <- function(id, data, params, updates){
             removeModal()
           })
         } else if (nrow(data2plot) > 100) {
+          waiter$hide()
           showModal(modalDialog(
             title = "Warning",
             "The dataset has more than 100 rows. This may cause a high runtime. Do you want to continue?",
diff --git a/program/shinyApp/R/pca/server.R b/program/shinyApp/R/pca/server.R
index 07f05c9c..518dc2f8 100644
--- a/program/shinyApp/R/pca/server.R
+++ b/program/shinyApp/R/pca/server.R
@@ -55,6 +55,10 @@ pca_Server <- function(id, data, params, row_select){
             step = 1
           )
         })
+        
+        output$PCA_Info <- renderText({
+          "Press 'Get PCA' to start!"
+        })
 
         ## Data Selection UI ---
         observe({
diff --git a/program/shinyApp/R/sample_correlation/server.R b/program/shinyApp/R/sample_correlation/server.R
index 48e441df..1b5e1c81 100644
--- a/program/shinyApp/R/sample_correlation/server.R
+++ b/program/shinyApp/R/sample_correlation/server.R
@@ -39,6 +39,11 @@ sample_correlation_server <- function(id, data, params){
         })
       })
       
+      # Add initial text to help boxes
+      output$SampleCorr_Info <- renderText({
+        "Press 'Get Sample Correlation' to start!"
+      })
+      
       # Do sample correlation plot 
       toListen2CorrelationPlot <- reactive({list(
         input$Do_SampleCorrelation,
diff --git a/program/shinyApp/R/single_gene_visualisation/server.R b/program/shinyApp/R/single_gene_visualisation/server.R
index e961e682..f6868b46 100644
--- a/program/shinyApp/R/single_gene_visualisation/server.R
+++ b/program/shinyApp/R/single_gene_visualisation/server.R
@@ -103,6 +103,9 @@ single_gene_visualisation_server <- function(id, data){
             )
           }
         })
+        output$SingleGene_Info <- renderText({
+          "Press 'Get Single Gene Visualisation' to start!"
+        })
       })
      
       toListen <- reactive({
diff --git a/program/shinyApp/server.R b/program/shinyApp/server.R
index 7ba49de2..6a24bd56 100644
--- a/program/shinyApp/server.R
+++ b/program/shinyApp/server.R
@@ -910,6 +910,10 @@ server <- function(input,output,session){
   })
 
 ## Do preprocessing ----  
+  # Add initial text to help boxes
+  output$Statisitcs_Data <- renderText({
+    "Press 'Get-Preprocessing' to start!"
+  })
   selectedData_processed <- eventReactive(input$Do_preprocessing,{
     # only enter this when you actually click data
     req(input$Do_preprocessing > 0)