Zacc's test UI code update
More to come !
I know it is not readable but I will fix that in the future dont worry
Merge remote-tracking branch 'origin/master'