Fixed transition and started using _layout