Presentation improvements
Merge branch 'updates'