Presentation tweaks from master