Presentation improvements, fixes #29