Improve design draft