- UI fix and code cleanup