Refactor renewal screens