Improve presentation based on @crispinh2o changes