Working on the repos view and refactor
Refactor complete
Fixed merge conflicts