NavigatorButton modified and insert implemented