Adding in navigation fragment support