Refactoring the pulldown (filtering/annotations), changing the ui slightly