mostly reworking modularized views for EPF