7 - Gui changes - working on paint method

	Reviewed by: Simon
7 - Merge cronthreadder into main

	Reviewed by: Simon