HTML,j2 Files refactored