Design Fixes