Completed results with CSS
Fixed merged conflicts
Fixed more merged conflicts