Merge pull request #73 from ColinWa/master

Fleet Fuel Menu - Service Fleet Dashboard: Fixes
Mother of All fixes.
Merge upstream/master