Tweaking to match design