var names fix, menu