Merge "Factor out a menu class for screen ui"