Hmmm, both good suggestions Waz.
I'll look at it with fresh eyes in the morning, maybe do mock build to see how it looks!