Finishing #205 for navigationBar