Updated terminology for list, consolidated buttons, added some usability updates, (empty list messages etc)