Fixed layout for phone - release 1
Merge branch 'developement'