Fixes all the things

 - unbroken
 - updates reference to views folder