Changed then whole GUI....also added more functionality