Added simple html renderer + refactoring