Structure clean up
UI update