Client Over hall

Client layout changed and code adapted
Merge remote-tracking branch 'origin/master'