Main menu, options and placeholder states
Use  as opposed to
Add test to check that correct name is set on contact
Fix inconsistent spacing
Restructure test
Fix minor typo
Merge branch 'feature/issue-5-main-menu' into develop