[FIX] Remaining instances of <a class="linkbut"> (those not inside div class="navbar" or already inside <span class="button2">, etc.) changed to <span class="button2"><a>, so all instances should have this format now. (A few files remaining pending commit conflict resolution.)