Merge pull request #117 from alijc/master

New web layout for On the Fast Track