Update the view based on review meeting in https://tower.im/projects/e4621b0e378746caaeae146a021fcd26/messages/b6ed9312f70942c48c9ec4da0f5b35f0/