Search function
Beautify html
Update 1