Changes after PR merges, so app works together

[stepsen89]

• [x] skipped NavBar test due to setup (will be addressed in later PR)
• [x] export in the same way
• [x] spreading data object as properties