Fix post detail layout and fonts II
Solve conflicts due to --amend approach