Misc form and tooltip updates

@ajself