Formatting cleanup from the scoreboard update. Also handle skill permissions differently.