Made some changes to gui