Post controller and template updates.

Valid HTML, controller updates (no more panics on invalid addresses.