Sped up adding two cards
Tidied up the main menu
Merge branch 'develop'