Logo change, null tables fix