Improvement on the interface, mostly on options organisation