Add Contact, Improve Tests
Finish layout and routes