Updated to single form views