massive reconfiguration time again.

Looks really good as is!
Cley