Starts redesign of modal
fixes conflicts
adds changes that I thought were lost
Merge branch 'master' of https://github.com/brysonchill/trendrr