Move scoreboard back into hudcontext