Design updates from Zach
Functionality updates from me
Merge branch 'develop'

* develop:
  Design updates from Zach Functionality updates from me