Fix #130, Fix #119
Merge branch 'design' of github.com:po-devs/webclient into design