Redesign and make contact works