change html structure and added spec helper