More top and bottom menu refactor.

Change-Id: I06330e609bcb1b9f6ba28ccf0867d1ae48b219d8