3224rebase

Rebase version of jame's pullreq for 3224, it was a html comment that was deleted only conflict, and few changes, switched logo gif and such nothing major.