Further presentation tweaks