some layout testign
Merge branches 'toWorkOn' and 'master'