Widget Changed to New one
Some other visual tweeks