Rename a dp and remove unneeded things

IsNavButtonVisible -> IsCloseButtonVisible