GUI cleanup (removed delegates and added extensionmethod

for easier invoking)