Better ui

Optimization
Some new test
Finalize integration