Some form interface improvements