added tool bar to NPA
deleted unneeded TVCs from NPA