refactoring err handle
update layout
Merge branch 'develop' into bitdewy/master