Tweaks to tables in theme, better integration