Finished NH advantages view
Merge branch 'feature/nh_advantage_display' into develop