updated styling, background imaging
resolve merge conflict