Removed temporary container background, minor bug fixes