Classic Mode bug fix
Merge branch 'master' of https://github.com/BuildmLearn/Mobile-applications