Finish adding Contact
Fixed bugs
Finish layout and routes