Fixed transitions and added selector