Added some css
Added clients
Merge branch 'develop'