Fixed 2 GUI bugs