added forms to show page
merged changes