Layout improvement, widget refresh,