Fix widget order