Updated ui.R and server.R