added friendlys and some ui updates