Refactor to contact layout