Lazy loading of content in the background. Minor bug fixes.
Merge branch 'master'
Merge branch 'master'
Minor text changes