bugs fix and shop design
Merge branch 'feature-sms-text' into develop