More bug fixes on Design Improvements