Small refactoring + settlement details page