Post state options dropdown refactor