Move uni_form tweaks to base_layout