Fixes drop-down and adds cancel request