Further presentation improvement