Bug fixes in GUI