css fixes
css fixes, image resizing
merge fix