Restructured markup, added templates. Don't remove ID from MapCanvas