Updated TosController + CMS Bundle + UI Bundle