Add avatar and refactor devise views