Big changes

Added Ranking
Changes layout a bit
Cleaned code
small changes