Add yellow bg
Fix background