Fix minimal
Refactor contact layout