hopefully final gui bug fixes
fixed merge conflict