Moved location of widgets, and which widgets are included