Clean-up navigation and add arrow to switch chart