minor design bug fixes
minor design bug fixes