Added some labels and new fields to page