Cleaned up the contact layout.