Add some fixes in presentation engine, and keynotes