moved some templates around and fixed menu urls