R4: Small presentation tweaks