Separated out the menu, did a tiny bit of cleanup.
Template 3 introduced, based on suggestions from Holly Kerchner.