Fixed serveral GUI bugs