Update layout screen
Merge branch 'master' into feature/internalnote