New menu + mess in files