Added nameplate options tweaks