First steps to correct Activity and Fragment instantiation