Life cycle improvements in both fragments