Use cleaner markdown, restructure templates