updated the gui even more

^ that, I should be done with settings, now its time to merge some stuff
and pray that it doesnt screw up