and more GUI work