Slight refactoring to actions, display of payments