Refactored batch logic
Re-separated snapshot data
Converted basic investment views
Fixed comparison presenters
Merge branch 'snapshot-separate'