Fix some design