More work on tabs module