Refresh templates, add some styles and class wrappers