Refactored activity view and begin work on area view/control