Added textviews and edittexts to some places