Bug fixes for mobile
Merge branch 'development'