Pull gui code from aymeric branch