Mostly done with menu refactor - need to work out way to capture keyboard input in top activity