styling / graphics
merge fix