Layout tweaks and bugfixes; deployment updates.