Tidied a few things up
Merge branch 'master' of https://github.com/qtheninja/StartupBoard