More designfixes