Fixed and removed missing ui fields.