Revert refactor attempts, fix section positioning issues and link fragment navigation