Fixing bugs with navigation and active classes