Fix hover fill on bars
Merge branch 'layout' into develop