JC: minor change on views and added more field to edit form.