UI improvements: header forms