fixed routing and added active states to menu