Added more GUI stuff.
Fixed conflict and removed more connections