Some Major refactoring along with the inclusion of tabbed panes instead
of new instances