Various

I didn't notice the redesign PR before I made the changes... But anyway, these changes are pretty straight-forward and could be merged more easily.