Updated form fields to metro style
Comment template included with minor customisations (to complete)