Make module compliant with 1.4.10
Add tabs