scroll view changes, Layout and font changes
resolves conflicts