Add live API
Small template fixes