Reordered widgets to avoid map selection bug