Continued refactor of areas and footer