removed Utils dependency, updated service accordingly, updated demo markup