refactored options and cleaned up filter page