Added adresses, rate system and changed UI