Fix up design