Rotation support + older active_layer changes