After spending the last couple of hours staring at this thing trying to get the templates right, I'm rapidly coming to the conclusion that the next re-design will be not long in coming. Suggestions?