Yet more functionality added to GUI