adding html elements mapper
refactoring controller class