css finished (refactor needed)
merge changes