Add claim to inner pages and some small margin tweaks