GUI and functionality updated