* #16: fixed menu issues