Updated and improved PR -  Update view.html.php #2665