Minor Design Tweaks