Add support to both sidebar and navbar navigation