Small bug fix and menu improvement.