2 more larch templates + some Athena menu improvements