menu links all filtering correctly
menu actually links all filtering correctly
final sidebar changes