[Bugfix] UI form fixes