Implementing listener basis. Fixing couple of bugs. We can move figures now.
Resolved trivial conflict