Changing Object View to tabbed view

Restructuring code