critical fix in managing, fixes in menu