Updated the todo and views

There were a few bugs with the view and some links I have since fixed
them. This has required some folder renaming.