edited templates, fixed menu linking