Big perf and ui improvement
Optimised build