Fix many bugs + Better UI (anault & alexroy)