Some major cleanup/updates of shiny app