A few changes to GUi, still unfinished