fix errors
Merge remote-tracking branch 'coyotte/design' into design