Add dialog componens and other changes