added new server.r and ui.r