Fix naming and change bg color