Restructure work HTML/Templating and CSS Change