Merge branch 'feature/struct' into develop
fixed UI bugs
Merge branch 'develop' into feature/struct