Add / Fix streams forms and views