#60 Mobile Fixes