Added ui and server