Improved GUI slightly
Trying to avoid refactoring work
Too much work
I don't wanna do it
pls