Make some small imporvements to the design