More work on Angular services, minor visual fixes.