Big perf and ui improvement
Optimised build
Merge branch 'v3'