design bug fixes