updated discharge form to new layout
updated all templates to new layout