Fix menu problems