41 - GUI changes - no more double drawing

	Reviewed by: Simon and Robert