Changed server.r and ui.R