Bugfix/91 mobile #91

Fixed some mobile issues
:+1: