Fix them load box
Merge branch 'develop' into feature/database/migrate