minor updates to incident controller and main_template