Making it independent of other branches (re-disabling filters menu) and finishing