Added Naming To Entities and Redid GUI