glued commits
Merge pull request #28 from dashinfall3/mobile_design_v2

glued commits