Fixes to support some ovverriding to the home, in terms of style