IMPROVED: simplify default ui handling