Added server and ui