Refactor + fixed member dropdown