Refactored some
Fixed a GUI bug, Improved delegation of context menu creation

Fixed a GUI bug, Improved delegation of context menu creation