Modify all GUI, clean and comment code