Fixing UI forms