Merging anythink-hotfix--text
Reformat Fines/Messages page
Merging anythink-hotfix--blocks