Added styling to client
Merge Client