cleaned server.R and ui.R