added background, rearranged classes