Slightly updated the new view.
Fixing some file conflicts.