Improve final presentation