Adding content view, and remving usage of Display Class
removing dead code