Add presentation draft, fix style, refactor