more changes to css.
added styling.
completed merge
merge.