Fix manual finding, UI whitespace errors