Fragment overlap fixes