Fixed red background
Merge branch 'dev'