gui bug fixes before merge