Design minor improvements