Merge branch 'hotfix/minor_css_edit'
fix_stat_display_logic
Merge branch 'hotfix/fix_stat_display_logic' into develop