Added menu/header checks
Merge branch 'master' of https://github.com/teutates1989/rowintothefuture