minor
minor
minor
minor
simplify user menu