Fix most bugs with new GUI system