fixed merge conflicts and started to create contact layout