initial widget commit
fixed conflicts