DCAF FrontEnd Home Fixes