ui.R and server.R updated