Fixed up Setup Home view, fixes #832