Correcting problems with quotes
Some nice GUI changes