Improve design option