44 - GUI code visually refactored

	Reviewed by: Simon