fix up layout/design. Add trash for project folders
Merge branch 'develop', remote-tracking branch 'origin'