Updated final ui.R and server.R