Rename/rearrange notification popup menu

- http://i.imgur.com/c2dPVZw.png

Change-Id: Id866f96ea82c7ae11a0ea2304aacd9a416dec197