Style changes and html code clean up