Refactor companies views; Refactor specs