Merge branch 'branch_fix_styles'