Multiple Design Tweaks and optimization