minor template fixes
refactoring, promote comment moved, navigation username changed to display_name