Cleaned up filter view and adjusted badges to be more circular