Little fixes on gui, needs more