Adds filter step and functionality and toolbar nav