fixed conflicts
minor css changes