address comments #1
refactoring options_decorator
refactoring xhtml serializer and fixing specs after added javascript support