Daniel's feedback

Added some improvements thanks to Daniel's feedback and a little more
readable gantt.