Work on new client graphics
clean up