Refactoring

Works for a and div tags and nested tags
Added new tags