Refactor, menu example added