design stuff
Merge remote-tracking branch 'remotes/origin/feature/design'
change client id for web app