Implemented a configuration chooser
Now able to call the chooser directly
Code cleanup