Added a menu, and some minor template changes