Updated functional to use of several Activity instead of Fragments