[IMP] Improve branch and build form views