formatting single views
merge

Merge branch 'master' of https://github.com/elanas/Shuq
merge

Merge branch 'master' of https://github.com/elanas/Shuq
fixed phone issue