Yes - I will rework this as soon as I get time and put it in view.html.