Added partial menu implementation