rename and navigation added