Made some change to GUI