Work on angular template and api