Improve presentation and fix bug on generation