Improved styles, created services and controllers