Simulatie: UI fix
Merge remote-tracking branch 'origin/master' into Tim