Fix - Design Modifications