Did some changes to ranks layout