Fixes to the client and style changes