Theme/template tweaks for MIT

Fixes some of the minor issues noted in testing over the last few days.