style and markup cleanups
service refactoring
more refactoring

and added graph directive