Cleaning up menu items, fixing menu bugs

Change-Id: I5b60cf603d786e9a1981194248ce395ea490065c
version now says "Custom"

Change-Id: Ied9e2d597063ebfa4d0c8de64634755aed9b2218