Ameya: COmpleted  the Edit Types Activity and Layout