updated initial widget and lobby widget
merge