Fixes #139.
Some fixes across complementary pages.