Started refactoring the UI from Pivot to something else