Core/Armory: changed table layout