Final version of GUI/ Others minor changes