Duty detail refactor to fix layout