Updates from dev branch

Let's get all of the progress we've made into the `dev` branch so that it's easier for the designers to work with.