Complete saving logic for Epics. View improvments