Further Small Design Tweaks