designing results
merge conflicts
little css things