added background, removed unused classes