Changed some behaviour with activity-fragment and choice menu