Added spacing and color to cli
Merge branch 'cli-cleanup'