Drastically simplified empty states
DRY'd up the empty states by using a template
Merge branch 'improve-empty-states'