Added background and fixed bug