fix new post link display
clean-up code
Fix merge conflicts again