partial commit
Merge branches 'master' and 'old_layout'
text changed