Active link issue resolved, sidebar navigation added