Upstream sync: Added some button labels