added server and make some ui changes