Header / Footer views reorganization