Integrate mockups

https://trello.com/c/a2QllRar/15-integrate-the-mockups-with-the-functioning-backend