Kazoo 929

Couple more tweaks to get new layout working (see also kazoo_configs/KAZOO-929 branch as well).