#61 refactoring Finance View