Dev changes

changes to make the module more compatible with theme. Major changes
from previous version.