Implemented filtering and fixed toggle buttons in navigation bar