Improved the ViewTemplate

Including bringing back the SVG close icon