Port xconfig to Qt5 - Fix layout