Fixed bug where active class is not properly set in render_list
Merge branch 'navigation' into my