merge changes from #2 and #7

due to conflicts the changes have to be merged manually. this is the integration branch for this task.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information