added menu at root + cleanup