Fixed active page markers not working on navbar
Added group and list view