Try to fix chr view
Merge branch 'development'