Major website update and entity improvements