Fixed more GUI issues...