Changed active classes to match page name
Merge