Spruced up UI and changed server response