Cleaned up form views