Changed zoomed click behavior; more tweaks to layout