Correct sort order on top x page
Move branding to base.html