I've been messing around with the headers and sub headers on theO. I think it's a bit tidier now, what do you think?