Better presentation handling code