menu fix
new data layout