More cleanup and addition of views