GUI updated

To do: write functions