Move HeadsUp back to original menu and make it work

Change-Id: I698cb7e2af65da9a4733fc7544c6f4b740fa0795