fix options
remova bad options, use id as label
update transitions
cleanup transition logic