Added menu system to handle 2d overlay + test