Design fixes

It's getting boring