Task forms UI fixes