Initial refactor of the app to have all results on one page