restructured some templates and forms

Signed-off-by: Alexander Skjolden <alex@plastboks.net>