Fix bug 862361 - some better styles for the webmaker nav and a few HTML changes to accomodate it