Remade some things in graphical interface