[IMP] View refactoring to include a toolbar for future settings views and other feature