Minor improvement on GUI and cleaning the folder