Cleaned up the show view.
First set of code.
Merge branch 'feature/recurring-expand' into develop