[BUGFIX] Remove Add/New links