Thanks kurio,
After reviewing some some of the post history in this thread again, I've decided to leave well enough alone for now. I don't want to take the risks that making these changes might incur and I don't have enough time to play around with testing it.
Bookmarks