finished refactoring glance states
Merge branch 'dev-glance' into develop