Better background color for visibility
Merge branch 'front-end'