Refactor code for reuse
Adding service outline
Fixed color comparisons