added groups to final, changed navigation bar