Some minor changes with gui