Fix layout and add leaderboard