Refactoring && replaced htmllist