Fixed title  overlap and backgroudn scalling issue, incl for ohone
Merge branch 'staging'