Added menu building code