New GUI almost done