Few Design Tweaks