Mostly UI cleanup and client functionality