Merge "Fix for CSS problems in Horizon"