ui fix and cleanup...