implementation of commision task
Merge branch 'mobile-view' into dev
Fixes js problem