Some restructuring of badge view.
Some restructuring of user view.