Update Filter Button Switching and Fix filter spacing