Added angular selectors
Fixed markup issues
Following output