A few changes trying to fix the gui