Tuned the GUI and modified "click" events.
Merging test files with master branch