replaced sorcery with devise
merging views