Updated filter logic.
Updated toolbar alignment.