Design and click tweaks