Refractored UI and Server changes