Menu improvments,some dry