More work on the effects + data tabs