GUI dev changes