Ranking rules overhauled + Few layout improvements