Add some design fixes