Started refactoring to add bordered views on base of main-view