Added Design Improvements