improved perf and UI