Improve run form usability