Renamed entities and worked on widgets