[41] Some GUI checks and improvements