Adding controller fixes and new views