Container fixes. Redesign edit profile form