HTML/CSS reshuffling, preparation for post rating system
Fixed README merge conflict