Better menu control for everything pre-Honeycomb (Less changes)