more css tweaking
merge