menu calculation fixes