Changed a the way the background colors are set on the containers
cleaned up some spacing issues