Had you considered something like this? I realize you're already pretty far down the road with what you have but these might be a bit easier to navigate.