Even more chapter navigation tweaks