Added underscore to the Client and fixed the styles