refactoring UI
misc ui refactoring
rename file
refactoring EntityCatalog