Port related bug fix, change how entry form is generated/displayed