Added style and more code to service