Add transitions and cleanup title handler