Settings fix
Homepage layout
Merge branch 'master' of github.com:asif-meer/sms