Improve behavior of categories and skip-to-nav buttons