latest changes from controller and gui side.
Merge pull request #105 from ahajirnis/Controller_12/4

latest changes from controller and gui side.