modefied users master list and added some ui stuff