Updated to WP 3.6.1 and updated several templates