fixed #16, fixed #17 Presentation mode improvements