GUI Clean-up

unfinished