Added many improvements, including shiv for ie8 and better template
separation